From 434a747d4263d9cfcf54e7ed947342e1e88f2624 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 6 Jun 2023 22:52:12 -0400
Subject: [PATCH] print: Move frontend sources

Move the cross-platform printing sources
to the gtk/print subdirectory.
---
 gtk/meson.build                            | 12 +++---------
 gtk/{ => print}/gtkpagesetup.c             |  4 ++--
 gtk/{ => print}/gtkpapersize.c             |  4 ++--
 gtk/{ => print}/gtkprintcontext.c          |  0
 gtk/{ => print}/gtkprintoperation.c        |  0
 gtk/{ => print}/gtkprintoperationpreview.c |  2 +-
 gtk/{ => print}/gtkprintsettings.c         |  2 +-
 gtk/{ => print}/gtkprintutils.c            |  0
 gtk/print/meson.build                      | 10 ++++++++++
 9 files changed, 19 insertions(+), 15 deletions(-)
 rename gtk/{ => print}/gtkpagesetup.c (99%)
 rename gtk/{ => print}/gtkpapersize.c (99%)
 rename gtk/{ => print}/gtkprintcontext.c (100%)
 rename gtk/{ => print}/gtkprintoperation.c (100%)
 rename gtk/{ => print}/gtkprintoperationpreview.c (99%)
 rename gtk/{ => print}/gtkprintsettings.c (99%)
 rename gtk/{ => print}/gtkprintutils.c (100%)

diff --git a/gtk/meson.build b/gtk/meson.build
index 824d3c0129..479a7b6269 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1,6 +1,7 @@
 subdir('a11y')
 subdir('deprecated')
 subdir('inspector')
+subdir('print')
 
 gtk_cargs = [
   '-DGTK_COMPILATION',
@@ -128,7 +129,6 @@ gtk_private_sources = files([
   'gtkplacesviewrow.c',
   'gtkpointerfocus.c',
   'gtkpopovercontent.c',
-  'gtkprintutils.c',
   'gtkprivate.c',
   'gtkprogresstracker.c',
   'gtkrbtree.c',
@@ -303,19 +303,13 @@ gtk_public_sources = files([
   'gtkoverlay.c',
   'gtkoverlaylayout.c',
   'gtkpadcontroller.c',
-  'gtkpagesetup.c',
   'gtkpaned.c',
-  'gtkpapersize.c',
   'gtkpasswordentry.c',
   'gtkpasswordentrybuffer.c',
   'gtkpicture.c',
   'gtkpopover.c',
   'gtkpopovermenu.c',
   'gtkpopovermenubar.c',
-  'gtkprintcontext.c',
-  'gtkprintoperation.c',
-  'gtkprintoperationpreview.c',
-  'gtkprintsettings.c',
   'gtkprogressbar.c',
   'gtkpropertylookuplistmodel.c',
   'gtkrange.c',
@@ -407,6 +401,8 @@ gtk_public_sources = files([
   'gtkwindowhandle.c',
 ])
 
+gtk_public_sources += gtk_print_sources
+
 gtk_private_type_headers = files([
   'gtkcsstypesprivate.h',
   'gtktexthandleprivate.h',
@@ -626,8 +622,6 @@ gtk_public_headers = files([
   'gtk.h',
 ])
 
-subdir('print')
-
 install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/')
 install_headers(gtk_deprecated_headers, subdir: 'gtk-4.0/gtk/deprecated')
 install_headers(gtk_print_headers, subdir: 'gtk-4.0/gtk/print')
diff --git a/gtk/gtkpagesetup.c b/gtk/print/gtkpagesetup.c
similarity index 99%
rename from gtk/gtkpagesetup.c
rename to gtk/print/gtkpagesetup.c
index 5e77236127..588e43d8e7 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/print/gtkpagesetup.c
@@ -18,9 +18,9 @@
 
 #include "config.h"
 
-#include "print/gtkpagesetup.h"
+#include "gtkpagesetup.h"
 #include "gtkprintutilsprivate.h"
-#include "print/gtkprintoperation.h" /* for GtkPrintError */
+#include "gtkprintoperation.h" /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtkpapersize.c b/gtk/print/gtkpapersize.c
similarity index 99%
rename from gtk/gtkpapersize.c
rename to gtk/print/gtkpapersize.c
index 20fa327a64..97bd96d49c 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/print/gtkpapersize.c
@@ -26,9 +26,9 @@
 #endif
 #include <math.h>
 
-#include "print/gtkpapersize.h"
+#include "gtkpapersize.h"
 #include "gtkprintutilsprivate.h"
-#include "print/gtkprintoperation.h"  /* for GtkPrintError */
+#include "gtkprintoperation.h"  /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 
 /* _gtk_load_custom_papers() only on Unix so far  */
diff --git a/gtk/gtkprintcontext.c b/gtk/print/gtkprintcontext.c
similarity index 100%
rename from gtk/gtkprintcontext.c
rename to gtk/print/gtkprintcontext.c
diff --git a/gtk/gtkprintoperation.c b/gtk/print/gtkprintoperation.c
similarity index 100%
rename from gtk/gtkprintoperation.c
rename to gtk/print/gtkprintoperation.c
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/print/gtkprintoperationpreview.c
similarity index 99%
rename from gtk/gtkprintoperationpreview.c
rename to gtk/print/gtkprintoperationpreview.c
index af4ae58799..423e352390 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/print/gtkprintoperationpreview.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "print/gtkprintoperationpreview.h"
+#include "gtkprintoperationpreview.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkprintsettings.c b/gtk/print/gtkprintsettings.c
similarity index 99%
rename from gtk/gtkprintsettings.c
rename to gtk/print/gtkprintsettings.c
index 04a02e350e..5daa6e6711 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/print/gtkprintsettings.c
@@ -23,7 +23,7 @@
 
 #include <glib/gprintf.h>
 
-#include "print/gtkprintsettings.h"
+#include "gtkprintsettings.h"
 #include "gtkprintutilsprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidget.h"
diff --git a/gtk/gtkprintutils.c b/gtk/print/gtkprintutils.c
similarity index 100%
rename from gtk/gtkprintutils.c
rename to gtk/print/gtkprintutils.c
diff --git a/gtk/print/meson.build b/gtk/print/meson.build
index 8028cd520a..78312aabd6 100644
--- a/gtk/print/meson.build
+++ b/gtk/print/meson.build
@@ -6,3 +6,13 @@ gtk_print_headers = files([
   'gtkprintoperationpreview.h',
   'gtkprintsettings.h',
 ])
+
+gtk_print_sources = files([
+  'gtkpagesetup.c',
+  'gtkpapersize.c',
+  'gtkprintcontext.c',
+  'gtkprintoperation.c',
+  'gtkprintoperationpreview.c',
+  'gtkprintsettings.c',
+  'gtkprintutils.c',
+])
-- 
2.30.2